From: Tassilo Horn <tassilo@member.fsf.org>
Date: Thu, 30 Dec 2010 13:53:22 +0000 (+0100)
Subject: * doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also... 
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5319
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=543cb0e829c6c43261c12bf3d49da866d962b827;p=emacs.git

* doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS Office) files also for searching.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb7b961e409..ae4cf34363c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
+
+	* doc-view.el (doc-view-doc->txt): Handle OpenDocument (or MS
+	Office) files also for searching.
+
 2010-12-30  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* doc-view.el: Implement viewing of OpenDocument (and Microsoft
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 9d0f6a3af63..9f5826484e5 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -813,6 +813,12 @@ Start by converting PAGES, and then the rest."
      (doc-view-pdf->txt (expand-file-name "doc.pdf"
                                           (doc-view-current-cache-dir))
                         txt callback))
+    (odf
+     ;; Doc is some ODF (or MS Office) doc.  This means that a doc.pdf
+     ;; already exists in its cache subdirectory.
+     (doc-view-pdf->txt (expand-file-name "doc.pdf"
+                                          (doc-view-current-cache-dir))
+                        txt callback))
     (t (error "DocView doesn't know what to do"))))
 
 (defun doc-view-ps->pdf (ps pdf callback)